Skip to content

[FSSDK-9359] chore: Catch up the main branch from release branches #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 13 commits into from
May 9, 2023
Merged

[FSSDK-9359] chore: Catch up the main branch from release branches #55

merged 13 commits into from
May 9, 2023

Conversation

mikechu-optimizely
Copy link
Contributor

Summary

  • Merging release branch(es) into the main branch

Test plan

  • Tests should pass

Issues

  • FSSDK-9359

mikechu-optimizely and others added 13 commits March 13, 2023 08:27
@mikechu-optimizely
[FSSDK-8962] Update branding names
ebb202d
@mikechu-optimizely
[FSSDK-8962] Add CONTRIBUTING.md
978f0bc
@mikechu-optimizely
[FSSDK-8962] Update README.md
f945990
@mikechu-optimizely
[FSSDK-8962] PR review requested changes
1111afc
@mikechu-optimizely
[FSSDK-8962] Update Pod::Spec homepage link
83e6186
@mikechu-optimizely
[FSSDK-8962] Update CONTRIBUTING.md
091bf4a
@mikechu-optimizely
[FSSDK-8962] Restore & reorder badges
d9a8c1c
@mikechu-optimizely
[FSSDK-8962] Remove excess H3; Add code typing
2c8598b
@mikechu-optimizely
[FSSDK-8962] Reorganize sample + other stuff
8483afe
@mikechu-optimizely
[FSSDK-8962] Remove build & coverage badges
1a65cca
@mikechu-optimizely
[FSSDK-8962] Bump version & changelog (#46)
005ecca
@mikechu-optimizely
[FSSDK-9359] chore Prepare for v1.0.1 GA release (#53)
0158ff5 
* Fix gradle & proguard rules

* Update CHANGELOG

* Bump version numbers

* Fix year in CHANGELOG
@mikechu-optimizely
Merge branch 'master' into mike/merge-1.0.1-master
257532b 
# Conflicts:
#	CHANGELOG.md
#	README.md
#	pubspec.yaml
@mikechu-optimizely mikechu-optimizely marked this pull request as ready for review May 9, 2023 14:38
yasirfolio3
yasirfolio3 approved these changes May 9, 2023
View reviewed changes
Copy link
Contributor

@yasirfolio3 yasirfolio3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mikechu-optimizely mikechu-optimizely merged commit e8e0b91 into master May 9, 2023
@mikechu-optimizely mikechu-optimizely deleted the mike/merge-1.0.1-master branch May 9, 2023 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@yasirfolio3 yasirfolio3 yasirfolio3 approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
chore
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mikechu-optimizely @yasirfolio3